babl: avoid accidental matrix overwrite by long names

.. by increasing the static per space allocation to 512 bytes, these names need
to become shorter - or the name be allocated dynamically. This fixes problems
with parameterized lab / sRGB like TRCs - which yielded really long names.

diff --git a/babl/babl-icc.c b/babl/babl-icc.c
index 2682fcddee63ccf7fa18a3a26bacbea11be78c82..d6857b2337f9df0312b52d85bfb402bb371eff8e 100644 (file)
--- a/babl/babl-icc.c
+++ b/babl/babl-icc.c
@@ -531,6 +531,7 @@ const char *babl_space_to_icc (const Babl *babl, int *ret_length)
     icc_write (s15f16, state->o + 12, space->RGBtoXYZ[5]);
     icc_write (s15f16, state->o + 16, space->RGBtoXYZ[8]);
 
+
     write_trc (state, "rTRC", &space->trc[0]->trc);
 
     if (space->trc[0] == space->trc[1] &&

diff --git a/babl/babl-space.c b/babl/babl-space.c
index 3f0812ba92377a8d7b3b9ade1609289fa138f41b..6966abaa55176b03914d8c98b88645b1ac390d0f 100644 (file)
--- a/babl/babl-space.c
+++ b/babl/babl-space.c
@@ -110,6 +110,9 @@ static void babl_space_compute_matrices (BablSpace *space)
 #endif
 
   memcpy (space->XYZtoRGB, mat, sizeof (mat));
+
+  babl_matrix_to_float (space->RGBtoXYZ, space->RGBtoXYZf);
+  babl_matrix_to_float (space->XYZtoRGB, space->XYZtoRGBf);
 }
 
 const Babl *
@@ -136,7 +139,6 @@ babl_space_from_rgbxyz_matrix (const char *name,
   static BablSpace space;
   space.instance.class_type = BABL_SPACE;
   space.instance.id         = 0;
-
   space.xr = rx;
   space.yr = gx;
   space.xg = bx;
@@ -181,6 +183,7 @@ babl_space_from_rgbxyz_matrix (const char *name,
   space.RGBtoXYZ[6] = rz;
   space.RGBtoXYZ[7] = gz;
   space.RGBtoXYZ[8] = bz;
+
   babl_matrix_invert (space.RGBtoXYZ, space.XYZtoRGB);
 
   babl_matrix_to_float (space.RGBtoXYZ, space.RGBtoXYZf);
@@ -254,6 +257,7 @@ babl_space_from_chromaticities (const char *name,
   if (name)
     sprintf (space_db[i].name, "%s", name);
   else
+          /* XXX: this can get longer than 256bytes ! */
     sprintf (space_db[i].name, "space-%.4f,%.4f_%.4f,%.4f_%.4f,%.4f_%.4f,%.4f_%s,%s,%s",
              wx,wy,rx,ry,bx,by,gx,gy,babl_get_name (space.trc[0]),
              babl_get_name(space.trc[1]), babl_get_name(space.trc[2]));

diff --git a/babl/babl-space.h b/babl/babl-space.h
index fd7d976bf3f9caf5d78fb1a234d83f20bc992954..70ed53576639ae050d3909ca6da1dff745f5dd1c 100644 (file)
--- a/babl/babl-space.h
+++ b/babl/babl-space.h
@@ -44,7 +44,8 @@ typedef struct
   double           pad; // for when the numbers represent a matrix
 
   const Babl      *trc[3];
-  char             name[128];
+  char             name[512]; // XXX: allocate this dynamically instead -
+                              //      or use iccv4 style hashes for name.
   double whitepoint[3]; /* CIE XYZ whitepoint */
 
   double RGBtoXYZ[9]; /* matrices for conversions */